remove conflict moarker

diff --git a/ChangeLog b/ChangeLog
index 715fd44031b0370e0fa6e41ee7c1e16579b941db..5482dbcd7f9e6218506f50cb0aa8d696dcc9eb50 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -217,7 +217,6 @@ Mon Oct 29 11:31:40 2001  Owen Taylor  <otaylor@redhat.com>
        * docs/Changes-2.0.txt: add a little note about the GtkPreviewInfo
        changes
 
->>>>>>> 1.2483
 Sun Oct 28 09:15:39 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkimcontext.h (struct _GtkIMContext): Fixed

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 715fd44031b0370e0fa6e41ee7c1e16579b941db..5482dbcd7f9e6218506f50cb0aa8d696dcc9eb50 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -217,7 +217,6 @@ Mon Oct 29 11:31:40 2001  Owen Taylor  <otaylor@redhat.com>
        * docs/Changes-2.0.txt: add a little note about the GtkPreviewInfo
        changes
 
->>>>>>> 1.2483
 Sun Oct 28 09:15:39 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkimcontext.h (struct _GtkIMContext): Fixed

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 715fd44031b0370e0fa6e41ee7c1e16579b941db..5482dbcd7f9e6218506f50cb0aa8d696dcc9eb50 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -217,7 +217,6 @@ Mon Oct 29 11:31:40 2001  Owen Taylor  <otaylor@redhat.com>
        * docs/Changes-2.0.txt: add a little note about the GtkPreviewInfo
        changes
 
->>>>>>> 1.2483
 Sun Oct 28 09:15:39 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkimcontext.h (struct _GtkIMContext): Fixed

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 715fd44031b0370e0fa6e41ee7c1e16579b941db..5482dbcd7f9e6218506f50cb0aa8d696dcc9eb50 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -217,7 +217,6 @@ Mon Oct 29 11:31:40 2001  Owen Taylor  <otaylor@redhat.com>
        * docs/Changes-2.0.txt: add a little note about the GtkPreviewInfo
        changes
 
->>>>>>> 1.2483
 Sun Oct 28 09:15:39 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkimcontext.h (struct _GtkIMContext): Fixed

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 715fd44031b0370e0fa6e41ee7c1e16579b941db..5482dbcd7f9e6218506f50cb0aa8d696dcc9eb50 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -217,7 +217,6 @@ Mon Oct 29 11:31:40 2001  Owen Taylor  <otaylor@redhat.com>
        * docs/Changes-2.0.txt: add a little note about the GtkPreviewInfo
        changes
 
->>>>>>> 1.2483
 Sun Oct 28 09:15:39 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkimcontext.h (struct _GtkIMContext): Fixed

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 715fd44031b0370e0fa6e41ee7c1e16579b941db..5482dbcd7f9e6218506f50cb0aa8d696dcc9eb50 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -217,7 +217,6 @@ Mon Oct 29 11:31:40 2001  Owen Taylor  <otaylor@redhat.com>
        * docs/Changes-2.0.txt: add a little note about the GtkPreviewInfo
        changes
 
->>>>>>> 1.2483
 Sun Oct 28 09:15:39 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkimcontext.h (struct _GtkIMContext): Fixed

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 715fd44031b0370e0fa6e41ee7c1e16579b941db..5482dbcd7f9e6218506f50cb0aa8d696dcc9eb50 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -217,7 +217,6 @@ Mon Oct 29 11:31:40 2001  Owen Taylor  <otaylor@redhat.com>
        * docs/Changes-2.0.txt: add a little note about the GtkPreviewInfo
        changes
 
->>>>>>> 1.2483
 Sun Oct 28 09:15:39 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkimcontext.h (struct _GtkIMContext): Fixed